Merge tag 'upstream/1.0.4'
authorAron Xu <aron@debian.org>
Mon, 8 Aug 2016 06:36:18 +0000 (14:36 +0800)
committerAron Xu <aron@debian.org>
Mon, 8 Aug 2016 06:36:18 +0000 (14:36 +0800)
commit11dc528fc4967baf3850fe6f4c98ae4c60d9f8cb
treed25024d077fef7aaffe549055fa6bc3daa1a4ce0
parent03d53dcaa5651deeb9e8a1312ae497a76598413d
parent8f0dc491a214e37446e6678bb97627c0efb42ea0
Merge tag 'upstream/1.0.4'

Upstream version 1.0.4